auto upstream
authorJoakim Verona <joakim@verona.se>
Mon, 21 Jan 2013 23:03:23 +0000 (00:03 +0100)
committerJoakim Verona <joakim@verona.se>
Mon, 21 Jan 2013 23:03:23 +0000 (00:03 +0100)

Trivial merge